From 601976439f0794fa203aef427f20c5fa437ea5f8 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 12 Aug 2004 14:17:30 +0000 Subject: [PATCH] Remove C99-isms. (#149967, Vincent Noel) 2004-08-12 Matthias Clasen * pixops/pixops.c: Remove C99-isms. (#149967, Vincent Noel) --- gdk-pixbuf/ChangeLog | 4 ++++ gdk-pixbuf/pixops/pixops.c | 21 ++++++++++++++------- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index 864acbb73d..d57d372831 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,7 @@ +2004-08-12 Matthias Clasen + + * pixops/pixops.c: Remove C99-isms. (#149967, Vincent Noel) + Wed Aug 11 22:56:55 2004 Matthias Clasen * abicheck.sh: Check all symbols. diff --git a/gdk-pixbuf/pixops/pixops.c b/gdk-pixbuf/pixops/pixops.c index b235a4ac5d..081191cd5d 100644 --- a/gdk-pixbuf/pixops/pixops.c +++ b/gdk-pixbuf/pixops/pixops.c @@ -107,10 +107,12 @@ pixops_scale_nearest (guchar *dest_buf, for (i = 0; i < (render_y1 - render_y0); i++) { + const guchar *src; + guchar *dest; y_pos = ((i + render_y0) * y_step + y_step / 2) >> SCALE_SHIFT; y_pos = CLAMP (y_pos, 0, src_height - 1); - const guchar *src = src_buf + y_pos * src_rowstride; - guchar *dest = dest_buf + i * dest_rowstride; + src = src_buf + y_pos * src_rowstride; + dest = dest_buf + i * dest_rowstride; x = render_x0 * x_step + x_step / 2; @@ -133,7 +135,8 @@ pixops_scale_nearest (guchar *dest_buf, } else { - INNER_LOOP(4, 4, guint32 *p32=(guint32*)dest;*p32=*((guint32*)p)); + gint32 *p32; + INNER_LOOP(4, 4, p32=(guint32*)dest;*p32=*((guint32*)p)); } } } @@ -169,10 +172,12 @@ pixops_composite_nearest (guchar *dest_buf, for (i = 0; i < (render_y1 - render_y0); i++) { + const guchar *src; + guchar *dest; y_pos = ((i + render_y0) * y_step + y_step / 2) >> SCALE_SHIFT; y_pos = CLAMP (y_pos, 0, src_height - 1); - const guchar *src = src_buf + y_pos * src_rowstride; - guchar *dest = dest_buf + i * dest_rowstride; + src = src_buf + y_pos * src_rowstride; + dest = dest_buf + i * dest_rowstride; x = render_x0 * x_step + x_step / 2; @@ -259,10 +264,12 @@ pixops_composite_color_nearest (guchar *dest_buf, for (i = 0; i < (render_y1 - render_y0); i++) { + const guchar *src; + guchar *dest; y_pos = ((i + render_y0) * y_step + y_step / 2) >> SCALE_SHIFT; y_pos = CLAMP (y_pos, 0, src_height - 1); - const guchar *src = src_buf + y_pos * src_rowstride; - guchar *dest = dest_buf + i * dest_rowstride; + src = src_buf + y_pos * src_rowstride; + dest = dest_buf + i * dest_rowstride; x = render_x0 * x_step + x_step / 2; -- 2.30.2